From: Rasmus <rasmus@gmx.us>
Date: Fri, 29 Sep 2017 08:41:51 +0000 (+0200)
Subject: Merge branch 'emacs-26' into scratch/org-mode-merge
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~19^2~6667^2~10^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d4b2bbdc73ace5cb0971a32a75941486489d1cc5;p=emacs.git

Merge branch 'emacs-26' into scratch/org-mode-merge
---

d4b2bbdc73ace5cb0971a32a75941486489d1cc5